Don't specify VT console structure at all when specifying

!console_use_vt. The dummy_con just confuses the VT
implementation and you get no console output without manually
specifying a console= boot parameter.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
index ce2acff5a1f33a835aa343394c16b87cc87d497d..1b02d51647744ab21e4826e43380fe5494cfd716 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
@@ -1866,13 +1866,6 @@ void __init setup_arch(char **cmdline_p)
 #endif
        } else {
                extern int console_use_vt;
-#if defined(CONFIG_VGA_CONSOLE)
-               /* disable VGA driver */
-               ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
-#endif
-#if defined(CONFIG_DUMMY_CONSOLE)
-               conswitchp = &dummy_con;
-#endif
                console_use_vt = 0;
        }
 }

diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
index 3f9ea69ce35f80df79e680e7a8ad284862c2c5f2..7ad9d8a6b9b2f4da20b63eb22d0ff4dc9b83aa52 100644 (file)
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
@@ -961,13 +961,6 @@ void __init setup_arch(char **cmdline_p)
 #endif
                } else {
                        extern int console_use_vt;
-#if defined(CONFIG_VGA_CONSOLE)
-                       /* disable VGA driver */
-                       ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
-#endif
-#if defined(CONFIG_DUMMY_CONSOLE)
-                       conswitchp = &dummy_con;
-#endif
                        console_use_vt = 0;
                }
        }